gdk: Shuffle code around

Make implementation, header and documentation be at the correct place.

diff --git a/gdk/gdk.c b/gdk/gdk.c
index 31fe06570410bb8f26ba06c9e9131227b7ac30ba..3e2ef2a0483c47c1b01a9c7c3854faed0941c5fd 100644 (file)
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -325,6 +325,21 @@ gdk_parse_args (int    *argc,
   GDK_NOTE (MISC, g_message ("progname: \"%s\"", g_get_prgname ()));
 }
 
+/**
+ * gdk_get_display:
+ *
+ * Gets the name of the display, which usually comes from the
+ * <envar>DISPLAY</envar> environment variable or the
+ * <option>--display</option> command line option.
+ *
+ * Returns: the name of the display.
+ */
+gchar *
+gdk_get_display (void)
+{
+  return g_strdup (gdk_display_get_name (gdk_display_get_default ()));
+}
+
 /**
  * gdk_get_display_arg_name:
  *

diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index 79d162b2a9df6261ac18b4612e2b8904ab82646a..f5b4ac2dd0d51d72d228a9f689d67554aa7af490 100644 (file)
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -1415,12 +1415,6 @@ gdk_display_get_name (GdkDisplay *display)
   return GDK_DISPLAY_GET_CLASS (display)->get_name (display);
 }
 
-gchar *
-gdk_get_display (void)
-{
-  return g_strdup (gdk_display_get_name (gdk_display_get_default ()));
-}
-
 /**
  * gdk_display_get_n_screens:
  * @display: a #GdkDisplay

diff --git a/gdk/gdkmain.h b/gdk/gdkmain.h
index 05b15b9928d81745657bcbd69c11b4b4ae7b37e5..4fbe7ac9b316fc35d2daf1297ce222ee1921de44 100644 (file)
--- a/gdk/gdkmain.h
+++ b/gdk/gdkmain.h
@@ -65,15 +65,6 @@ void                           gdk_error_trap_pop_ignored (void);
 
 const gchar *         gdk_get_display_arg_name (void);
 
-/**
- * gdk_get_display:
- *
- * Gets the name of the display, which usually comes from the
- * <envar>DISPLAY</envar> environment variable or the
- * <option>--display</option> command line option.
- *
- * Returns: the name of the display.
- */
 gchar*        gdk_get_display        (void);
 
 #ifndef GDK_MULTIDEVICE_SAFE